Better handle removing paths

Signed-off-by: Hector Acosta <hector.acosta@gmail.com>