More code removed