Simplification of code

Removal of extra code to fix layout problems, after I found out they
went away if png graphics device was launched before the plot is drawn
instead of in the end.