Remove interrupt stuff, adding later

Remove interrupt stuff, adding later