Removed method mappings and package prefixes