General cleanup of everything I can see right now