Removed unneeded constructors cleaned code