Cleanup; added Enrico layer code in SimpleHit3D