Moved PostgreSQL removal to the beginning