Remove old unused shit
Merge pull request #1492 from wild-billy/remove_unused

Remove old unused shit - part 1