Fixed some other traits related bugs (uninitialized variable, return => continue) Removed some trait related redundant code and variables