Add remaining service placeholders and remove unused bin/swift code