remove packrat, clean code