Cleaning up eggs view 2