Removed old/unused code & cleaned up the addys

It now works on GMS v149 & EMS v103