Fixed little bug and removed unnecessary vulnerabilities