Changes to delete empty methods