clean up, use gulp