Started cleanup of debugging stuff/unneeded functions.