Remove layer due to proxy code smell