Before cleanup
Cleaned up; testing for build