removed unneeded inheritance