Removing some leftovers from development