removed schema information from models
cleanup