Rearrange imports, remove bcrypt workaround