Remove compatibiliy layer. Minor adjustments