Feature 1 cleanup

Cleanup of #1