Refactored mapping lookup operations.
Removed unused file.