Removing debug messages and adding missed event