Merge "Better constant names, removed unused code, general cleanup." into graphics-dev