Cleanup + support for normals