Removed some useless stuff for the expo