removing commented out stuff