Removed unused event methods and general cleanup