Removing core PyPWSafe parts