[TASK] Move leftover code from cms to frontend