Rmoved old helpers
Minor changes