Remove code that should not be there
Remove code that should not be there