Add force for removing directories
Remove unneeded code