Make sure i clean up all my mess