WIP: Cleanup Vsite API

#240