Merge pull request #2799 from FinalAngel/develop

Cleanups