Cleanned dead code
Published type
Minor bug fix