First pass at removing inline javascript events and discuss with team