More code removal