Ide 1539

Lets remove this method as I think it can be done with less code as explained below.