cleaned up non-generic info