removed old unnecessary stuff