Cleaned up //Log statements and removed dead code