Minor code cleanup actions

Commented out the bits concerning the working directory to ensure the
code works elsewhere
Deleted
Last version