Removed old & unused code