dratisk mye opprydding
since functionality implemented
cleanup