Removed warning messages. A bit of code cleanup.