Removed unnecessary message passing.
Removing more unnecessary stuff