Remove old file
Clean up old code and add undo/redo messages