some cleanup, specially to serve the level editor