removal of further redundant boilerplate things