Code cleanup (removing regions) and fixed R# settings file