Cleanup for experimental - ready for collaboration!