Cleaned up some garbage