Comment some classes and implement map rectangle selection