Cleanup: removed dependency on crack. Removed hard coded mappings.