* code cleanup
The beta updates will work now. You will have to update to this revision manually though.