removed uneeded old parts