Removed aws check