140612 - Removed heaps of type duplicated redundant code.