Getting rid of delegates & systick support