returns for common
remove unused affine module
remove extra return