Cleaned up some things from testing