Cleaned up some leftovers