removed obsolete & unused code parts