Checking if proxy works with commits
Cleaning up code