Clean up files to set a good starting point for debugging and moving forward