wip
Removed unused things