(#40) cleanup for initial release