Code Clean-up

Now when implemented united function to do it, this junk no more need here