cleanup
reworking of the level framework