removed more duplicate and superfluos stuff