removed unnecessary objects+traits