Removed lazy base class edits