fixed some stray commas and removed unused code