Removed services code, too messy to maintain