Removed old unnecessary stuff