clean up code, fix profile camera issue