Remove unused things. Will implement later