requesetiong Full refactor suggestions

Remove unused code to keep it clean.