Cleaned up stale code