added task removal and small security changes