Clean up redundent code, removed constructor from bean