Remove unrequired code