Removed everything that isn't being called except map