Removed cleanup method as it seems to be potentially causing crashes