removed flags
made cleanup