removing non core code