Remove jQuery and improved object interception