iOS7-support (cleanup)