Removing functions not needed