Some cleanup & front camera test