Cleanup amateur stuff