removed class stuff