More onclick removal