More improvements, try and unlink unused files

More improvements, try and unlink unused files, check my scrubber: https://gist.github.com/t0mtaylor/9a450f3eb80c0d1c9b4d