Cleaned some project settings. Looks good, merging to develop