Cleanup

See below for full list of changes per commit