Remove checkLocation