Delete unused code to reduce confusion
Update for actual requirements