Delete unused code, change request handling logic