Clean up and removed unused comments and logs