Removed useless mappings, corrected "address" spelling