More code cleanup
still stuck with signing