Clean up and added nexus4 place holder