Removed testcode that caused exceptions