Added required cleanup