removed dead & unused code