Removed redundant & unused code