Removed additional base -> this refrences