Initial commit
Cleanup and bugfixes resulting in unwanted file creation