Removed old init, removed old includes