Deleted bits of unused code