Marantle remove unused code