[WIP] Comment out unused functions