Cleaning, features moved from Remus repository