Remove button added. Refactoring also.