Cleanup some unsed stuff