house cleaning
Merge branch 'master'
Cleaned up more usless stuff