Removing some Default Code