Removed dead code
Metadata fix and custom block support finished