More refactoring and dropping items