random cleanup

See commits.