Cleanup
Beginning to add GP to workbench