[FEATURE] Cleanup of old code