Fixed marker-shadow issues and removed unnecessary logs