cleanup , removed comments, debug and trash