Remove some commented-out stuff; Add secure push