Clean up some bad practices