useless codebits removed