Remove some lines of code