removed old unneeded stuff