Removed Warning message code (will be committed to it's respective branch)