Comment out unused blocks for now