Check in code clean up for moving to component scanning for loading
Spring beans