Remove some code to prevent confusion