Cleanedup dead code and comments