Removed redundant mapping