There are a few commented out functions here. Can they be removed?