Removed waiting for overlap key goals whenever they become non valid
Refactored code.