Removing unneccessary Bean annotation and changing componenet scan