Clean up

Put project.ConfigurationManager in try/with to prevent exceptions
Further cleanup
Merge pull request #454 from dungpa/cleanup

Clean up