Members renamed + unused code removed