More code removal..