Step toward fixing skybox + code cleanups

Move towards fixing skybox rendering with DS. Removed uneeded code.