Some cleaning stuff and adding postgresql