Cleaned up commented out eggs
A bit more cleaning of commented eggs