Removed some security issues