Removed mappings; need to figure out a better method.