Cleanup code

[asian-mario]

A lot of error warnings from dead code, some of them clearly are used but some are actually dead, should clean before the next release.