updated configurations, removed unused code