Map Code Clean Up

Cleaned Up Code & Removed Files