Stripped non-core code, will be moved to 'tharsis-full'