Remove seriously big unnecessary overhead when submitting new record