Removed Directions functionality and cleaned up code