Removed unused codes
Map feature completed