CLN: removing unnecessary stuff