removed old and unnecessary stuff