Removed Legacy code not used anymore!