Completed toggle and removal done