cleanup and push end content / now to be corrected :-)