Cleaned up some unnecessary things.