Cleaned up a bit
Merge branch 'cutdown'