removing obsolete info and restructuring