Cleanup comments and old code