removed stupid org stuff