AUI-1163 Partial remotion
AUI-1163 Fixing missing references
AUI-1163 Source formatting
AUI-1163 Source formatting (grunt format)