Got rid of redundant files
Merge with Weng Sang's map class fixes