Merge pull request #677 from afs/cleanup

Cleanup