Revert "Added CreativeTab and abit of code cleanup"

This reverts commit 62137890c47801669ee7534946efb5bd34787f60.