general cleanup and normalization
update specs/features using deprecated syntax