Most jQuery consolidation done, cleanup needed