Removed GCA, code cleaned