Cleanup

Giant ugly pull request take 1.