Added 2 objects. Improved removal of mouse listeners