Removed useless code and key mapping.