Adding utility module for cleanup