Cleaned up dead code