Debug and Clean up