Fixed some stuff; removed unused things