Cleanup, removed inline's and static's for now