Cleanup code to follow best practices

There are a number of code cleanup tasks that need to be addressed. For this initial cleanup let's fix the incorrect PHPDoc blocks and also remove the dead/commented out code.

In addition let's also address (most) of the phpcs notifications. We will leave the ones that require more significant changes and will handle them in separate issues, e.g. using container injection instead of directly referencing core services.