Commented out part that caused memoryleak