Some cleanup. Still not very useful