Fixed 'memory leak'
First step for easy removing of Pretopolib in Police branch, no GUI changes yet