cleaned up the AS warnings and removed unused imports.