Some leftover stuff that needs to be cleaned up