Removing unused constants
Cleaning up the sample project a bit, this still needs a lot of work