Removed dead code from World
Added layering Locatable drawing system