Removed AWS dependencies from current build