Removing no longer used code