remove auth logic
extract some modules from swift