[+FEATURE] added enclosure to cleanup