Reverting some unintended changes; Remove unused prop files