Move helpers into lib.
Remove dummy stuff.