Removed Unnecessary Old Code