Clean up some stray functions