MINOR CHANGE: Unnecessary code removed