remove unused comments & add one security layer