Removing unused ivars
Adding camera support.