Remove borked merge stuff
Update Refs
API tick