Intermediate Step - Cleanup

Remove test/