Code Cleanup: Removed map because itll never be implemented.