Removed some leftovers from earlier