remove debug and clean up