Update: removed some more unused things