Remove unnecessary nulls, update Cakefile