Removed some leftover dependencies on message fields which no longer exist