removed code that was used for bugtesting