[WIP] Removed deprecated stuff