Removed some now unused methods