Reverted structural changes, removed uglify for now