removed unused references
restructured