Cleanup code. Separated services project.