Removal of code that doesn't work