Removed moar addon stuff