Remove bad logic with validations, closes #1304