[TODO] Removed implemented items