House keeping on the frames and panels. Also removing old non-used code.