More cleanup
Build config cleanups
Replaced old Feedback360 with new