cleaned up some excess