Removing some leftovers from testing