Removed unused  useless stuff