Cleanup

No need to rename anymore.