Feature/graphics cleanup

Just some cleanup, use sample game's graphics cleanup branch.