Bug fix: added missing forward mappings; removed unused methods