better serve command, remove files and clean up cli