generic secret, cleanup commented code