Remove complex code