Removing commented out stuff