Cull old code after successful testing
Fix z-fighting issue from map