Removed some incorrect but harmless code left over after refactoring