falcon : Use those new files

Change-Id: Ibf963403b92fe024331c0008a021f25ce0852414
falcon : Delete those temp stuf

Change-Id: I867f57320abdf0c85043fdc8fefe1040caa212e5