Removed all the required messages, some to be discussed with Vivek