Refactor: checks removed