Cleaned up code, prepared for Build 1000 build and release. SEW 10NOV14