Commented out insecure functions and categorized