No need to delete instance in cleanup. Also fixing some cleanup code