Cleaned code for platforms evolution