Temporarily removed some code in the hope it will get rid of some bugs