Cleanup of non-essential things