Removed unnecessary functions implementations