Commented stuff out to remove warning