Cleanup for mono
Removed dupplicates