Removed some leftovers from previous review