Fix some errors
Remove unnecessary beans #5