Internal cleanup