Updated manifest and removed old code