Remove unused code and sending id for pictures