removing some use less code