Remove unneeded codes?