Added removeListener method

Added removeListener method
Code cleanup

Code cleanup