Fixed! Clean up typeMap