delete old drawer and refactoring