Removed prints & memory leaks