Removed Spring Beans & Merged with master/origin