added / removed features (cleaning up)