Code cleanup, remove code that is never used