Removed xcommon dep