Cleaning-up some collision layers and fixing a tileset height