cleaning out things from reference implementation