Remove Unnecessary Function