installation profile cleanup

See commits.