cleanup and fix redondency