removed unnecessary/old stuff