Removed onLoad hook