remove calvin_common from calvin_bringup