Removed a lot of terrible
Merge pull request #1111 from jaypoulz/buildFiles

Removed a lot of terrible
Removed more terrible
Merge pull request #1113 from jaypoulz/buildFiles

Removed more terrible