Bug Fixed: Unsecure functions removed before list