second(cleanup) commit of bower flow for v2