simplify and stop abusing mr.developer