Removed some test code and cleaned a few other items up