Cleanup

Remains after rename....