Cleaned useless codes