Removed unused Code. Exported to variant