Clean up code. There was some code left from development/debugging