Cleaning up several unused lines