removed non core parts