Remove unsed codes
Somme with fix for security system