Remove redundant cleanup functions from modules