More code to remove