Unnecessary classes, and cleaning up formatting a bit in prep for the PR to Forge