Lint and style
Remove unused environment and machine_environment