General cleanup - removed all stuff which will never be used