Removed un necessary functions