1) Deleted unused code
2) Finished re-implementing class scanning code using asm library