Removing unnecessary implementation